[flashrom] [PATCH] fix chip size limiting in atapromise

Carl-Daniel Hailfinger c-d.hailfinger.devel.2006 at gmx.net
Fri Feb 19 00:13:43 CET 2016


On 17.01.2016 12:51, Joseph C. Lehner wrote:
> Just tested it, programmer is still working on my Ultra100!
>
> Regards,
> Joseph


On 18.02.2016 22:21, Urja Rannikko wrote:
> Seems fine (i built it etc) except for one tiny nitpick noticed by git
> (or i think a default commit hook, but whatever) below.
>
> On Sun, Jan 17, 2016 at 2:57 AM, Carl-Daniel Hailfinger
> <c-d.hailfinger.devel.2006 at gmx.net> wrote:
>> Atapromise chip size limiting has two bugs I didn't catch during review,
>> but only in the moment of commit.
>>
>> The current code is checking model_id to remember if a chip has already
>> been limited, but if flashchips.c contains two subsequent chips with
>> different vendor_id but identical model_id the adjustment will not be
>> done. Switch to checking the chip size instead.
>>
>> If a chip has multiple whole-chip erase functions, only one will be
>> modified. Fix that.
>>
>> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
>>
>> Index: flashrom-atapromise_fix_limit_chip/atapromise.c
>> ===================================================================
>> --- flashrom-atapromise_fix_limit_chip/atapromise.c     (Revision 1916)
>> +++ flashrom-atapromise_fix_limit_chip/atapromise.c     (Arbeitskopie)
>> @@ -79,38 +79,35 @@
>> [...]
>> -               if (i != NUM_ERASEFUNCTIONS) {
>> -                       chip->total_size = rom_size / 1024;
>> -                       if (chip->page_size > rom_size)
>> -                               chip->page_size = rom_size;
>> +       /* Chip is small enough or already limited. */
>> +       if (size <= rom_size)
>> +                       return;
> ^ That line has a mix of spaces (first) and a tab... rest of the
> function seems to be tabs, so fix with spaces=>tab seems appropriate.
>
>
> So with that fixed, this is:
> Acked-by: Urja Rannikko <urjaman at gmail.com>

Thanks for the tests and the review!

Fixed the whitespace and
committed in r1930.

Regards,
Carl-Daniel




More information about the flashrom mailing list